merge with xen-unstable.hg
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Tue, 12 Dec 2006 22:25:02 +0000 (15:25 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Tue, 12 Dec 2006 22:25:02 +0000 (15:25 -0700)

Trivial merge